Auto merge of #1585 - tshepang:typos, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 6 May 2015 00:11:54 +0000 (00:11 +0000)
committerbors <bors@rust-lang.org>
Wed, 6 May 2015 00:11:54 +0000 (00:11 +0000)

Trivial merge